Change my completely wrong approach on handling boolean properties