Removed the main id and role
Design improvement