Core: Adding two classes to hold coordinates