Removed context dependance, but changed constructor arguments