WIP: Adding more definitions
WIP: Adding more definitions