Reworked prop assoc - got rid of silly naming convention