Renamed file and more methods implementation