Renaming
Removing Features dependency
Finish renaming
Initial (working) implementation, with Time format only