Some more helper methods added