Changed static attributes to instance modifier