Improves validations on Locatable module