Completing initial functionalities