Updated entity template validation
Updated media upload