Added selector parser
Added module support