Complete refactor and alias support