Move around validate entry to support additional content types later on