Moving to later version of lombok
Adding Grid mapping code with the hope of making this more general and cover easy mapping