Made doctrine requirements more exact