added PluggableModels, removed PluggableFactory, refactored pluggableDefault methods
resolved merged conflicts