Implemented missing methods and variables