Fixed injecting options
Added category validation
Mark version