Added locking support and string/file haml evals