Additional Entities Handling