Added missing imports
Added some methods