Nightly Sync

Added base class support for aliens