Removed constructor and added helper methods