Co-authored-by: jjlawren <jjlawren@users.noreply.github.com>
* Improve code placements * Fix entity inheritance * fix tests * Improve PLATFORM_SCHEMA handling * Apply suggestions