Removed unnecessary annotations + introduced "Feature not implemented yet"