Stability improvements and added helper methods