Fixed activator bug
Added parser