Added requested features for V1. Ready for testing