Core and Velocity modules fixed