Completed basic features