Removed class constraints