Removed lombok and added getters & setters in its place