added typesafe decorator
moved @typesafe
fixing decorators