Implemented additional functionality