Added all the classes, RTC integration is still pending