Now it's working with apartment gem