Refactor convenience properties