Added Support for double-features