A proposal for merging context-awareness and user preferences in the same software system is provided. Several modules from the on-going CLOUD4All project (European Commission Seventh Framework Programme) are enhanced with Context Awareness, including the Semantic Matching Framework, the RuleBased Matchmaker (with new rules) and the Statistical Matchmaker (with new features to be used as predictors). Some other components are created exclusively to deal with context features, as the Context Aware Server (to add context from motes) and the Minimatchmaker (to save computation and network resources for well-known situations)