Add some procedures for better performance