Update for alias system

Fix command null pointer
Merge changes