Minor changes and added some methods