Fixed array implementation and moved back to a single module