Added usage and some checks