Improve comment
Add checkers to avoid broken aliases