WIP: Adding more definitions