Added some objects and upgraded prototype interface