Bugfix: Resolving internal types
bugfix: Remove with children on db