Added missing features. Features conflicts resolved.