Made basics property logic more concise