Added more methods implementation