Moved contract checks to separate class