Should these be mapped in AbstractEntity?