added new static costs and persistence, fixed some findby queries due to change in model