Added module on Entities