Added box and circle collision masks